From: Joakim Verona <joakim@verona.se>
Date: Thu, 15 Jan 2015 13:54:25 +0000 (+0100)
Subject: merge master
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~23^2~3414
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=0298a2c6a10bc3b79cb2f45a1961dd7ac6da4e6d;p=emacs.git

merge master
---

0298a2c6a10bc3b79cb2f45a1961dd7ac6da4e6d